Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  P2P: Fix copying of secondary device types for P2P group client

Change-Id: I92b09f0e9bfb6d1cbb0f215e859f266b9a34e415