Merge "Snap for 6960446 from 513926fc07f451c58e0c346a9c214018eca858fd to androidx-enterprise-release" into androidx-enterprise-release