p2p: pick 5g channel from more possible channels am: 64b9063624 am: e42c40592e

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

Change-Id: I718ff58134f99a3e021494011973a4dd118ef651