Merge "Snap for 5341122 from f094924d2540421b8a578359d104e16388821150 to androidx-g3-release" into androidx-g3-release