Merge changes I67b3fe39,I2ad5c542

* changes:
  CameraService: Add unit test for stuck HAL at startup
  CameraService: Don't block on camera HAL start in all cases