[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: 9578d67f15 -s ours am: 34999d5d80 -s ours am: 8a5b09335a -s ours

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

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

Change-Id: I6f722bb9002e200773e2c46d9d6f38a9b9754241