[automerger skipped] P2P: Fix a corner case in peer addition based on PD Request am: 8b68d7983c am: 112b4b26fc am: 98b18db49a am: d3788476a6 -s ours am: 8de75abab0 -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: I70529dff589dad94ed4a6de5cdf362fc4bb56202