[automerger skipped] P2P: Fix copying of secondary device types for P2P group client am: 22c30be53c -s ours am: 5844dcaebe -s ours am: 8c78ca6c81 -s ours

am skip reason: Change-Id I6837931dcd3be01e68dc93d79ec1f874063fcae3 with SHA-1 7382285854 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/13066760

Change-Id: I66b52999f93494bc94608b18e14984dc25ead6e9