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

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

Change-Id: I4dc143a4047d7f0b188a2c7ad3efbed6420d7c3b