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
# eL8UAJ0V/8+8WMKX9OwB/Ru49HmwmhsRBwCfWgDcHb88AHNUz3TLKTGtEY2Orxc=
# =hscd
# -----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 1186 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 (22) and others
# Via Automerger Merge Worker (85) and others
* tag 'android-12.1.0_r7': (44 commits)
Hide non-system overlay window on ActivityPicker
Hide non-system overlay window on ActivityPicker
Hide non-system overlay window on ActivityPicker
Hide non-system overlay window on ActivityPicker
Hide non-system overlay window on ActivityPicker
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Do update signal icon for -1 level in AddAppNetworksFragment
Restrict secondary users to share Wi-Fi network
Set exported flag to false.
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Hide private DNS settings UI in Guest mode
Change default USB configuration to a RestrictedPreference
Use android.app.AlertDialog in SetupChooseLockGeneric
Prevent exfiltration of system files via user image settings.
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
...
Conflicts:
src/com/android/settings/network/NetworkProviderSettings.java
Change-Id: Idd39e1a814ff8d3ec85bb91131f075a22e85f499