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

Change-Id: I16427dfe37c74082623619b65e04c2eddfd8316b