[automerger skipped] P2P: Fix copying of secondary device types for P2P group client am: 803c2d6698 -s ours

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

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

Change-Id: I982e6889cbe23eaae7f7d40f88941deeab8cd319