[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 -s ours

am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

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

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