Merge "DO NOT MERGE: CameraService: Link to client binder death at end of connect" am: 6bbaad1b91  -s ours
am: cf98e0b316  -s ours

* commit 'cf98e0b3169a73069412d58554a68339fbe06c21':
  DO NOT MERGE: CameraService: Link to client binder death at end of connect