[automerger skipped] Merge Android 13 QPR2 am: 90d5444233 -s ours am: d104ec269f -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: I74a3d31b3d1a5ed80be6cdfc838757c504d849a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>