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

Change-Id: I6cac490e910c741972bdced53e9ac451a7df32e6