[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 62fe343bc4 -s ours am: 998d78971c -s ours am: 6b3b3ff2f5 -s ours am: c439bf2afd -s ours

am skip reason: Change-Id Ic08b97c9660daee8bd69db381ea55234d37a0106 with SHA-1 3b09f24d1d is in history

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

Change-Id: I72f40cfb8bb2272408f66924f0bdc81b238190fa