[automerger skipped] Merge Android 13 QPR2 am: 63a85860 -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: I055f4cecddc1847d6bbeb60c25ac9c387b0987b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>