[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 298a3d232e -s ours

am skip reason: Merged-In I49fa69b4026f8e3caadf13e5b36620f0d7b67d68 with SHA-1 ad9e6efafb is already in history

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

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