Merge tag 'android-12.1.0_r7' of https://android.googlesource.com/platform/packages/apps/Messaging into HEAD
Android 12.1.0 Release 7 (SQ3A.220605.009.A1)
Change-Id: I5eaea8f505fb82aad741c2f9c83e1fc8bbcc2991
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYp57OgAKCRDorT+BmrEO
# eICMAJ44MbwqBhNkX5BuMSwgLoLXeyOp+ACfZfatQUfDCEs86c8mLY8qP0f06YI=
# =h2+7
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 07 Jun 2022 12:10:02 AM CEST
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key