Merge tag 'android-13.0.0_r16' into staging/lineage-20.0_merge-android-13.0.0_r16

Android 13.0.0 Release 16 (TQ1A.221205.011)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY45r9QAKCRDorT+BmrEO
# eNQYAJ94xf0k5uCVHN7BGiViMuQ85l25cQCdFKPEEj3a2beW3Ku0QWCXLu+pXgM=
# =QKIe
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Dec  6 00:08:53 2022 EET
# 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 1387 signatures in the past
#      13 months.  Encrypted 4 messages in the past 10 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 William Escande (2) and others
# Via Automerger Merge Worker (166) and others
* tag 'android-13.0.0_r16':
  Revert "Revert "update MultiAbiTargeting matching logic""
  Make writing command-line arguments as a comment in the generated file optional
  Clear apex.go entries for bluetooth libs
  Clear apex.go entries for bluetooth libs

Change-Id: I91dfe04e71861dbcde596183f12999eea34aabfe