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

am skip reason: Merged-In I6df328dead00c05dcbd8eedf63fc24a8d6141871 with SHA-1 4acdab7658 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2186564

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