Merge "Revert "Revert "Revert "Camera2: Use hidden APIs""""
am: 6033321c6f

Change-Id: Iecace490bf08078caff7614f7ad1460e56349380