[automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 5ceba22611 -s ours am: 9e3e766ed5 -s ours

am skip reason: Merged-In Icd15f6e7bfdd7b3e3d0d4b407195258d4171c560 with SHA-1 d00b8598bb is already in history

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

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