[automerger skipped] Merge Android 14 QPR1 am: 9778507c74 -s ours am: af60f74d02 -s ours

am skip reason: Merged-In If704cb3fc0f3698dbdedba4d83d515d001835c2a with SHA-1 9055c1b74e is already in history

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

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