[automerger skipped] P2P: Fix a corner case in peer addition based on PD Request am: 8b68d7983c am: 112b4b26fc am: 98b18db49a am: b6d0694d7a am: 978c85494d -s ours

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

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

Change-Id: I472a3df0725d368e5fc2a9f20a6821589ee94acc