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

am skip reason: Merged-In Ifc63a9168157c912d553078c516305d506c834e7 with SHA-1 2412acf1ab is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/27273971

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