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':
  Revert "Add wakelocks to audio retries"

Change-Id: Id8c0113f178eb64d149e8e450e89dbb7acd8f046