Merge "Snap for 6960446 from 9ad6093b44a93efd92bd8fb3b9858b854388654a to androidx-enterprise-release" into androidx-enterprise-release