[automerger skipped] Merge "Merge Android 13 QPR1" am: 995144c4 -s ours am:...

[automerger skipped] Merge "Merge Android 13 QPR1" am: 995144c4 -s ours am: a9e4f399 -s ours am: ea405a7a -s ours

am skip reason: Merged-In I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533 with SHA-1 3ee79d5a is already in history

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



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