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

* commit '33689420d13283f192c66ca7e78776064a2def28':
  Camera2: Add camera type to getNumberOfCameras.