am b6a57b4b: am f7fdaf86: am 35beb4e5: am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs""

* commit 'b6a57b4b97a174049eeb9148240b3363902bff6d':