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

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

Change-Id: Ia4744bf2c7bd11b5bf4cf805d5ea8b13eb2e6eaa