[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future am: 4d1a998258 -s ours

am skip reason: Merged-In Ib0433f8d6f1492624c42150af6732d31d76b660b with SHA-1 3689189850 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/28717693

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