[automerger skipped] p2p: avoid adding duplicate channel lists am: 8183656c61 am: 6a7451e1ba -s ours

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

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

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