Merge "Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras"...
Merge "Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev am: cbf999bd" into qt-dev-plus-aosp
am: 1c1e4a62
Change-Id: I0cdbd29ca3c2e9dd048ec6adb5078e75e22bd595