[automerger skipped] P2P: Fix a corner case in peer addition based on PD Request am: 838e6fd132 am: c4b9f24c45 am: 5316032b03 -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/+/13856732

Change-Id: I13eef593625825b323b8efff282d076bb553c4e9