[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 48912f2de3 -s ours am: fef7eff44a -s ours

am skip reason: Merged-In I35ba2f25b5f0489fca026b315df3d4a4c09b3991 with SHA-1 cfe990a02e is already in history

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

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