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

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

Change-Id: I975ce2e612e979884c82ef9da6e70b70dce076aa