Merge "Camera: Ensure correct error message for disconnected devices" into nyc-dev
am: 7f688ed

* commit '7f688edcace6c7abc9ef566669c4511849ad2493':
  Camera: Ensure correct error message for disconnected devices

Change-Id: I9e462cca01ff78b65e73cb9f83f42d92b4066cfa