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

* security-aosp-pi-release:
  P2P: Fix copying of secondary device types for P2P group client

Change-Id: Ib3be600e4893361dd7114f50afff798cac0b3f26