[automerger skipped] p2p: avoid adding duplicate channel lists am: 245a5fad4f am: f579f3b97d -s ours

am skip reason: Merged-In I4185ad15bfa06dd41765d9fe5f159ad0d9e5f017 with SHA-1 afee24e08e is already in history

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

Change-Id: I93e85fab5674d1b6955addfa0511e562a387b5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>