[automerger skipped] P2P: Fix a corner case in peer addition based on PD Request am: 61dece6d28 am: 3d4eb0e32c am: 45e9e4223b am: 8c2db50b5d am: a3aff44978 am: 5e0845cf63 -s ours

am skip reason: skip tag Change-Id Ief7781491bd545fc1028b9b386fe7a4564102848 with SHA-1 61dece6d28 is already in history

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

Change-Id: I744a3a06e9dfac4a3a80f1b9eda8e110df9f6b95