[automerger skipped] Merge Android 13 QPR3 am: 6c136ebd48 -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: Ide5c10f41ecaf6855f5ec20d5a7327c7684a7f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>