[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 9669c9a185 -s ours am skip reason: Merged-In Ifd0bd0acd5d234b4f448ea5fc58fc9adfea7244a with SHA-1 1a2ffd5ee0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27555392 Change-Id: Ic402ccd8714bd2d3008b01ae4fb8a6175dfed439 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>