Snap for 12997303 from 29aed31a83320013ffbf980ec451eb0a3e77f605 to 25Q2-release

Change-Id: If0d1096825a2b0c333d5a9d9f89b50966a72e880
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index 0880999..2aa7530 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -1486,6 +1486,7 @@
     name: "libwpa_aidl",
     vendor: true,
     cppflags: [
+        "-DCONFIG_NAN_USD",
         "-Wall",
         "-Werror",
         "-Wno-unused-parameter",