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

* commit 'ec26692d1f65cf04963d8412e3e3bdd0d42796ea':
  CameraManager: Separate service listener into a singleton