[automerger skipped] Merge 24Q4 into AOSP main am: 4d96659256 -s ours

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

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

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