Merge "CameraBase: Don't return an sp<> by reference" into security-aosp-mnc-mr1-release