Merge "DO NOT MERGE: CameraService: Link to client binder death at end of...
Merge "DO NOT MERGE: CameraService: Link to client binder death at end of connect" am: 6bbaad1b -s ours
am: cf98e0b3 -s ours
* commit 'cf98e0b3':
DO NOT MERGE: CameraService: Link to client binder death at end of connect