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

Change-Id: I0d5a6fca59538fe25a192c023b7232bede6e18d7