This reverts commit 1ec3b78b67. Reason for revert: breaks all camera use cases Bug: 135568875 Exempt-From-Owner-Approval: revert, no build cop Change-Id: Iec8e1f94f5bedced3f3faf73f851fd2f13e2e768
1ec3b78b67