[automerger skipped] Merge Android 12 QPR 3 am: 167b1323 -s ours am:...

[automerger skipped] Merge Android 12 QPR 3 am: 167b1323 -s ours am: d78ccb45 -s ours am: f69ba54b -s ours am: ae459425 -s ours am: a56fcd08 -s ours

am skip reason: Merged-In If22bfeab1cc46bc88d337d90859d79000fe294e9 with SHA-1 ad49b200 is already in history

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



Change-Id: If390de53e76fb7aa8e243ea6a96fc7ccccba6899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>