Merge "QCamera2: HAL3: Combine sensor, and ISP gains into EXIF" into nyc-mr1-dev