[automerger skipped] Merge "Merge Android 13 QPR3" am: 377be1fa -s ours am:...

[automerger skipped] Merge "Merge Android 13 QPR3" am: 377be1fa -s ours am: 73fbb4f3 -s ours am: 96672ca1 -s ours am: 479cf483 -s ours

am skip reason: Merged-In I054707abb86a406dfb3ce4f211338107da0a6582 with SHA-1 8cf1bf3f is already in history

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



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