Merge "Snap for 14376354 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-main-release" into androidx-main-release