Merge tag 'android-12.1.0_r2' of https://android.googlesource.com/platform/packages/apps/Messaging into HEAD
Android 12.1.0 release 2
Change-Id: Ic7c2328372a763728d93050ec20a2c6974bbd3fd
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYjjXfgAKCRDorT+BmrEO
# eH76AKCSbqegY78B+sxZkvrW05li6/ot9gCfbBrtVFY+taI5Ciu3H/Fcw8V4Cc8=
# =QAQl
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 21 Mar 2022 08:52:30 PM CET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key