Merge "API level 30 upgrade: AOSP Dialer" am: e98287809e am: c5af967504 am: 17c942c7fd

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1782168

Change-Id: Ifbe535dae7873f2d4e177f005b523fe09ec2afb8