[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 372e66e3ed -s ours

am skip reason: Merged-In I97998b225edceb2f17203f56f40688c69ceb6934 with SHA-1 6e3d8fa39b is already in history

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

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