am bef61478: am 7a4c2711: Merge "Fix CameraService error flag when running...
am bef61478: am 7a4c2711: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
* commit 'bef61478':
Fix CameraService error flag when running HAL1 with API2.