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

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

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

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