[automerger skipped] Merge 24Q4 into AOSP main am: 4d96659256 -s ours am: 9e5fefc4df -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/+/3364329

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