Merge "CameraService: Fix cameraId type of onDeviceStatusChanged" am: 2dab1fe48b
am: 103177fd33

* commit '103177fd3326a9aac9cb64d2ab4efcb193571ed5':
  CameraService: Fix cameraId type of onDeviceStatusChanged