Merge the 2021-06-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  P2P: Fix a corner case in peer addition based on PD Request

Change-Id: I41e968998634a3eae94264535332d7da890893f9