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

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

Change-Id: Ibd201b7cee982747a7b2223d7f0d95d9d924575c