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

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