am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."

* commit '77979736ea5fe4448d77937df56d84d263436034':
  P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index fc311e9..4b505b5 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -5160,7 +5160,7 @@
 			   "during provisioning");
 		return;
 	}
-#ifndef ANDROID_P2P
+
 	if (wpa_s->show_group_started) {
 		/*
 		 * Use the normal group formation timeout between the end of
@@ -5173,7 +5173,6 @@
 			   "complete");
 		return;
 	}
-#endif
 
 	wpa_printf(MSG_DEBUG, "P2P: Set P2P group idle timeout to %u seconds",
 		   timeout);