cdbd84de26
This reverts commit 46ec20b692.
Reason for revert: breaks all camera use cases
Bug: 135568875
Change-Id: I86747c0df5489f80d1966dd07669637597fb2b00