Merge "Camera: Pass targetSdkVersion to camera service APIs" into sc-dev