[automerger skipped] P2P: Fix copying of secondary device types for P2P group client am: 803c2d6698 -s ours am: 721db55b37 -s ours am: 14f1daea76 -s ours am: 5c95f7236c -s ours am: 7f47deb083 -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/+/13066759

Change-Id: I913cfeda7a8eb5bf3ac0c968ef3a2f472a7329c6