Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev