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

* commit 'e7afc1a8af5d8bd9124bf9b4e47d4ae8e1fac5ae':
  CameraService: Fix cameraId type of onDeviceStatusChanged