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

Android 12.1.0 release 22

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYuwJswAKCRDorT+BmrEO
# eCfTAJ9XEwUFBwOrHR5ZdJyzA2LkVHKAPACfe60Gia6MqrwCbuxuXObPv+eNDck=
# =9A/F
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu Aug  4 14:02:27 2022 EDT
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key