This reverts commit 8fd44b77. Reason for revert: breaks all camera use cases Bug: 135568875 Change-Id: I5fa15649993709df6d9dcea73a07f9a22abed7de