Merge change 6084 into donut

* changes:
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)