Merge "optimize p2p scan time in finding auto GO" into sc-dev am: d96f16d889 am: 349e972f0f

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

Change-Id: I74894478a07458d0eb4ce3ca03cbdb6d09303997