[automerger skipped] Merge Android 12 am: f8cd116eeb -s ours am: d1dff794bc -s ours am: 97e596ebff -s ours

am skip reason: Merged-In I3f26c7349bb46ddd70b75527102babac5d328f8a with SHA-1 04ad300b61 is already in history

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

Change-Id: I3952cd0b1fd2c7751a50f2d4b11f718f95ebe2db