Merge "Snap for 13936899 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-window-release" into androidx-window-release