Merge "Fix javadoc for CameraManager.AvailabilityCallback"