[automerger skipped] Merge Android 13 QPR1 am: 34eab1cf -s ours am:...

[automerger skipped] Merge Android 13 QPR1 am: 34eab1cf -s ours am: 6d2b3a28 -s ours am: 4290797a -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: Ifc7003884135bbe4fd7a0e81bd082d392660eaae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>