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

Change-Id: I1aa163ce85ccd2c52702e8120246ae825e9e1b76