am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into...
am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit 'ec26692d':
CameraManager: Separate service listener into a singleton