Merge "Camera: HAL3.3 LSC keys CTS update" into mnc-dev