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

Change-Id: Ie1d5b90d429abadcbc4d8aba7eb1d42766925c47