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

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