[automerger skipped] Merge "Merge Android 12L" am: 883faa0d -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: 883faa0d -s ours am: ac9e2b0a -s ours am: 169c7ecf -s ours am: f2d7fd4c -s ours

am skip reason: Merged-In I433a20010d6eb1ad3aca45d7e4b663510f1b023d with SHA-1 4c5a5815 is already in history

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

Change-Id: Id538601cfe979b876f2ab159401e2138dc899ca1