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

Change-Id: I405a850af7848aa5cb797bd92bb246502f456045