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

am skip reason: Merged-In I0d6ef15f4b078b5e3a1cfe8db4ea633386089f79 with SHA-1 530248a9 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2990894



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