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

Change-Id: Ic620e32135bca86f7d932a096894c648e27a7a6e