Merge "Introduce CameraHalHdrPlusPreferenceControllerV2"