Merge tag 'android-13.0.0_r75' into staging/lineage-20.0_merge-android-13.0.0_r75
Android 13.0.0 release 75
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZQiSxAAKCRDorT+BmrEO
# eFWtAKCOOPwjK7MIq+S9leMjCQqpPOA96ACfbamYNsLPyyOQG556ZBYgx/0YoOE=
# =RfdB
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Sep 18 21:11:16 2023 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 1890 signatures in the past
# 22 months. Encrypted 4 messages in the past 20 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 Matías Hernández (2) and Taran Singh (1)
# Via Android Build Coastguard Worker
* tag 'android-13.0.0_r75':
DO NOT MERGE: Prevent non-system IME from becoming device admin
Settings: don't try to allow NLSes with too-long component names
Don't hide approved NLSes in Settings
Conflicts:
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
Change-Id: Ifc3b6c95d1a0dab8d6a6507879cdba35c84f4980