Merge "Snap for 7790816 from 01990004ec2192d7c85bcbfb18f236c60d32828a to androidx-browser-release" into androidx-browser-release