Merge tag 'android-12.1.0_r4' into staging/lineage-19.1_merge-android-12.1.0_r4

Android 12.1.0 release 4

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYksyjwAKCRDorT+BmrEO
# eDmSAJ4kwcWY5v1tHD+shWs13IpazYG4IQCfXxrcMxdvy1/gUrpt5xFvucr4nic=
# =Ul4Q
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Apr  4 21:01:51 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 1127 signatures in the past
#      5 months.  Encrypted 4 messages in the past 2 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 Jack Yu
# Via Android Build Coastguard Worker
* tag 'android-12.1.0_r4':
  Do not let guest user disable secure nfc

Change-Id: If6114c3260fb92c632dd0758578f6a14c4d6e3e4