P2P: Prefer driver preferred channels if no user preferred channels am: f928e8f6c7 am: c86c312007

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/18152012

Change-Id: I88d4f4edaafdc41558724670429780775aea83e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index cb01929..f1d033b 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -5803,7 +5803,7 @@
 				}
 				i++;
 			}
-		} else {
+		} else if (!wpa_s->conf->num_p2p_pref_chan) {
 			enum wpa_driver_if_type iface_type;
 
 			if (go)