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

Change-Id: I9488ec833190264087fe9a3da269c168c6771c9b