[automerger skipped] Merge Android U (ab/10368041) am: 0d50ee6dfe -s ours am: a756a9dbd3 -s ours am: 962122cb61 -s ours am: c5f0b49038 -s ours

am skip reason: Merged-In I2b71c400d1cd61b69a73cc169b7a19615f819de5 with SHA-1 4b4f786934 is already in history

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

Change-Id: Iacf4178ba5fd2370f770244638b3089b598db09b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>