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':
  Cherry-pick one upstream patch

Change-Id: Icd11a93c0c5c65df270cff6b265ec36b59c2f83e