Merge "Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev am: cbf999bd" into qt-dev-plus-aosp