[automerger skipped] Merge Android 12 QPR 3 am: 167b13231d -s ours am: d78ccb4505 -s ours am: f69ba54bcb -s ours am: ae4594254d -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: I732a59da48b199a065a5750aeba4b09a88569f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>