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':
  Set default polling mask and p2p listen mask

Change-Id: I1343ac628d33f631e4b4100e74e78c2521734244