[automerger skipped] DO NOT MERGE - Merge Android 13 am: b0e5404933 -s ours am: 247769b8a2 -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: I609addd8eb8f1726d1aba8a5602b32ba0d6611bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>