Merge "Merge cherrypicks of [1314394, 1314414, 1314415, 1314434] into androidx-security-security-crypto-release" into androidx-security-security-crypto-release