Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Messaging into leaf-3.2

Change-Id: Iaee85bed749deef6a4b56decceea4bbf955059a5