[automerger skipped] Merge "Merge Android 12" am: 4953fbcf1d -s ours am: 55e97e0858 -s ours

am skip reason: Merged-In I269ea522ba7356dca0bfa43e8a8ee8acdba7b7a2 with SHA-1 4e185ac618 is already in history

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

Change-Id: I48d47772d3be179e0dcb02a842417c5a9ab49ad3