am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev

* commit '6eec00ecf456b8a24487828b6f515cccc465cc1a':
  Camera: Reconnect after camera service crashes