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

Change-Id: Ic0f8870ea24a2e38336e704b2f9659754aedc99e