[automerger skipped] Merge "Merge Android R" am: 816ad2b6a2 -s ours

am skip reason: Change-Id Ib83cd87683ae896de789cdf6cd0c801562a191d5 with SHA-1 62fe343bc4 is in history

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

Change-Id: Ib50fa95c6e6c5a29790c0795ebad272fd5685f95