Merge "cameraservice: Correlate various CameraActionEvents" into udc-dev