[automerger skipped] Merge Android 12L am: 6899ca99 -s ours am: af00394b...

[automerger skipped] Merge Android 12L am: 6899ca99 -s ours am: af00394b -s ours am: 6b2a5067 -s ours am: 1788fe49 -s ours am: 9a7376a2 -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: I6b4d83f62f91e6bd137a3e8557c5b9cb5fd9300f