[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4e185ac6 -s ours am: 24adfa92 -s ours am: 49c578c2 -s ours am: f47e1c22 -s ours

am skip reason: Merged-In I975ce2e612e979884c82ef9da6e70b70dce076aa with SHA-1 17c942c7 is already in history

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

Change-Id: Ied7ce97ffa2e51db59b05ea4029791f82ccce18a