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

am skip reason: Merged-In I3325a060b5975aedc247ee5eb8c01831a245efc4 with SHA-1 8db3457353 is already in history

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

Change-Id: I8f1a8379493fbb57de2a7836f6c09cf4109295af