[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 4c5a5815af -s ours

am skip reason: Merged-In Iefda7364da3f5a5a8ebb70758ff126553bd64e16 with SHA-1 6d20dedceb is already in history

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

Change-Id: Ic03b8ef5418df5963c38a28558299736a190f8f4