[automerger skipped] Merge Android 14 am: ca69c0c659 -s ours

am skip reason: Merged-In I52f0e8b3dd63a0fff9c265bc9f229ab63a66ffde with SHA-1 4967067480 is already in history

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

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