[automerger skipped] Merge "Merge Android 13 QPR2" am: 728df4f5fc -s ours am: 44f5617ab8 -s ours am: 340d4ef692 -s ours am: fe7158ecee -s ours am: 90c5765579 -s ours

am skip reason: Merged-In I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2 with SHA-1 9a056455f2 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2487236

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