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

am skip reason: Merged-In I97040ef70395010900b52a37a5ea077c11744421 with SHA-1 b2616c74ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27274025

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