Merge "Snap for 13729941 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-browser-release" into androidx-browser-release