[automerger skipped] Merge "Merge Android 12 QPR 3" am: 3f7e7bf503 -s ours am: 30cf9a72ff -s ours am: 416973e590 -s ours am: 2206f11aa8 -s ours am: a4ffbfbbb8 -s ours

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

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

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