[automerger skipped] Merge Android 12L am: f68b12c5dc -s ours am: 7cf8a84386 -s ours

am skip reason: Merged-In I8b1787d54907dd3ef3dca2e6c9483893c4e73f7d with SHA-1 f9cd5ee24e is already in history

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

Change-Id: I6864d37c2a728ea62063920388c7eda9683e60f2