Merge "Snap for 13866934 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-camera-release" into androidx-camera-release