Merge cherrypicks of ['googleplex-android-review.googlesource.com/32663120'] into 25Q2-release.

Change-Id: Ia172271663be5e8a9eda15cd6afa7af06f09e7ee
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index 5a08fa1..cf902a1 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -794,7 +794,6 @@
         "-DCONFIG_DPP",
         "-DCONFIG_DPP2",
         "-DCONFIG_DRIVER_NL80211",
-        "-DCONFIG_DRIVER_NL80211_QCA",
         "-DCONFIG_ECC",
         "-DCONFIG_ERP",
         "-DCONFIG_FILS",