[automerger skipped] Merge Android 13 QPR3 am: 6c136ebd -s ours am:...

[automerger skipped] Merge Android 13 QPR3 am: 6c136ebd -s ours am: 3123f614 -s ours am: d4fd7662 -s ours am: 61985839 -s ours am: c8be69af -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: I8d78ce537c38009fd561782601a610acbc4009da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>