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

Change-Id: I17d8623149d2ca85fcea83ca5873f1a4921c6e4d