[automerger skipped] Merge "Merge Android 12" am: 4953fbcf -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 4953fbcf -s ours am: 55e97e08 -s ours am: b9b1afad -s ours am: c3a47d79 -s ours am: 35fa794b -s ours

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

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

Change-Id: I479a53e982d7d6a808da55fa7fa3f6df47432f76