[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: b6a67687aa -s ours

am skip reason: Merged-In I29c17ebeea5fe190221a490ed4388a33ca7bd950 with SHA-1 38f3721254 is already in history

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

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