[automerger skipped] Merge "P2P: Fix a corner case in peer addition based on PD Request" into pi-dev am: 47afebf11e -s ours am: b897a71946 -s ours am: 5a7b49e449 -s ours am: 687ceb1bd2 -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/+/13856735

Change-Id: Idc4c80940db4f52e8e13d58cdceae5eb2226405a