[automerger skipped] Merge 24Q3 to AOSP main am: b7c8b0376d -s ours am: 1200453f19 -s ours

am skip reason: Merged-In I2141d527a5a6d0a3b4f31911b5a468c885b8a782 with SHA-1 2dcc01ed1b is already in history

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

Change-Id: Ie4ac15cb623fce243d8012da80811e3e019aaf6b
Signed-off-by: Automerger Merge Worker <[email protected]>