[automerger skipped] Merge "Merge Android 13 QPR2" am: 82e0eca1 -s ours am: ecfa7523 -s ours

am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 9f788dbe is already in history

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



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