am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit 'eec25a4ffecc0c9a726aa284d29d0b7a1e58a888':
  Camera2: Add camera type to getNumberOfCameras.