Merge "Revert "Revert "Revert "Camera2: Use hidden APIs"""" am: 6033321c am: 156dc3b8 am: 5c2d5d45 am: 98cfb87a Change-Id: I61d2e654ca0dbcdbb10c464dbdbaeb38eb7b16dc