Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev