Merge tag 'android-12.1.0_r22' into sapphire-upgrade

Android 12.1.0 release 22

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYuwJjQAKCRDorT+BmrEO
# eCX1AJ9mAq+IBok7M7CZpt8ejeKBYOmAGwCfYcPIRXViSqx3FLjB7BD9Z3GqSww=
# =fuUB
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu Aug  4 14:01:49 2022 EDT
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key