[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 62fe4b99db -s ours am: 02bdbdef11 -s ours

am skip reason: Merged-In Id047eab50366273d99580d53433e25742e1f8516 with SHA-1 187477b9b7 is already in history

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

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