[automerger skipped] Merge "P2P: Fix a corner case in peer addition based on PD Request" into rvc-qpr-dev am: 72abf7fc72 am: ebd07d50f5 -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/+/13726989

Change-Id: I1bf57df2e0b9b5600dfb587e0c708af96ab3a462