Merge "Snap for 12845187 from 4f721e0798811ce352ac778ad371f852dfd539ff to androidx-credential-release" into androidx-credential-release