[automerger skipped] Merge "Merge Android 12L" am: 883faa0db8 -s ours am: ac9e2b0af5 -s ours am: 169c7ecf81 -s ours

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

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

Change-Id: Iecd2303f206b25e54c935472928b41c4993529cd