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

Change-Id: I112bf51c103203670763827aa7454b6f415758f9