Merge "Camera: Tonemap CTS update for HAL3.3" into mnc-dev