Merge "Use a shorter wait time for p2p connect with operating frequency" into sc-dev am: ca924c1648 am: b0dab250ad

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

Change-Id: I0398f6d7dd23c023d5a2b4a7a752ae017082b5a1