[automerger skipped] P2P: Fix copying of secondary device types for P2P group client am: 7382285854 am: 4260a0d92d am: 358476edef -s ours

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

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

Change-Id: Ia295301fc75f8b056778c836219e141230454e8e