[automerger skipped] P2P: Fix copying of secondary device types for P2P group client am: 5133d78464 -s ours am: 3868419a44 -s ours

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

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

Change-Id: I96e95398d1aa9492fe179d9f2f304fe7d626f68f