[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 7492d6fb18 -s ours am: 57c7276e94 -s ours

am skip reason: Merged-In I96891913dcbb5200788ed5c4dfeb14d49a38087d with SHA-1 16fb9fea93 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2989115

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