[automerger skipped] Prefer channel from P2P Preferred channel list for P2P Group formation am: 70e5f9dcf6 am: c3e3c47551 am: cf6a95a010 -s ours

am skip reason: Merged-In I3325a060b5975aedc247ee5eb8c01831a245efc4 with SHA-1 70e5f9dcf6 is already in history

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

Change-Id: I5388b11dbfe85496962f3d461a36f49156959cc7