[automerger skipped] Merge "Merge Android 13 QPR3" am: 377be1fa1b -s ours am: 73fbb4f368 -s ours

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

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

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