Merge changes I4588e7da,Ic4a70a1b into nyc-dev

* changes:
  Fix Emulator CTS tests for Camera, Location, Sensors, Telephony
  Camera: Disconnect camera after checking flash unit