Merge tag 'android-12.1.0_r7' into staging/lineage-19.1_merge-android-12.1.0_r7
Android 12.1.0 Release 7 (SQ3A.220605.009.A1)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYp57OgAKCRDorT+BmrEO
# eOnKAJ9ddh3gDc728xoE/ovWrCYDfuSE7wCeP9Bxp/IEyZ0HvA1mchoJRTy9pkQ=
# =Bcu6
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 7 01:10:02 2022 EEST
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1192 signatures in the past
# 7 months. Encrypted 4 messages in the past 4 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Bill Yi (3) and others
# Via Android Build Coastguard Worker (4) and others
* tag 'android-12.1.0_r7':
Remove NetworkCapabilities#combine*
Do not verify field count in tests used in CTS
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Change-Id: I22b96a041665a1e2b495abef68bed07d9ed9d60c