Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev