This reverts commit 7c92613185. Reason for revert: This commit breaks camera recording Bug: 184154831 Change-Id: Ia4286dab9c5d44c59a3b224e0e24c191eb2be84b
7c92613185