[automerger skipped] Merge Android 14 QPR2 to AOSP main am: c4536d56b8 -s ours

am skip reason: Merged-In Ifcca47195a72191cf9ed071ba7ba7b398f32d171 with SHA-1 fa470b4c8e is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2990679

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