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+BmrEOeAUCYp57OAAKCRDorT+BmrEO
# eBqaAJ9yI+SgvwNFBU/QAmhJo4HJyX8McwCePJz6Rgml3bpyfq2jaxB1vnP37tM=
# =YiTe
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun  7 01:10:00 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 1165 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 Android Build Coastguard Worker (12) and others
# Via Android Build Coastguard Worker (83) and others
* tag 'android-12.1.0_r7':
  Version bump to SQ3A.220605.009.A1 [core/build_id.mk]
  Version bump to SQ3A.220605.009 [core/build_id.mk]
  Version bump to SQ3A.220605.008 [core/build_id.mk]
  Version bump to SQ3A.220605.007 [core/build_id.mk]
  Version bump to SQ3A.220605.006 [core/build_id.mk]
  Version bump to SQ3A.220605.005 [core/build_id.mk]
  Version bump to SQ3A.220605.004 [core/build_id.mk]
  Version bump to SQ3A.220605.003 [core/build_id.mk]
  Version bump to SQ3A.220605.002 [core/build_id.mk]
  Update Security String to 2022-06-05
  Version bump to SQ3A.220401.002 [core/build_id.mk]
  Version bump to SQ3A.220316.002 [core/build_id.mk]
  Update Security String to 2022-05-05
  Update Security String to 2022-05-01
  Version bump to SQ3A.220308.002 [core/build_id.mk]
  Update Security String to 2022-04-05
  Add a keys argument to tapas
  Update Security String to 2022-04-01
  Update security string to 2022-03-01

 Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: Ie3877837fac152c6ab9181c0059b65f7fb5e22e1