Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev