Merge tag 'android-security-13.0.0_r8' into int/13/fp3

Android Security 13.0.0 Release 8 (10286630)

* tag 'android-security-13.0.0_r8':
  Cherrypick following three changes
  DO NOT MERGE - Cherry-pick two upstream changes
  Cherry pick the following two CLs from upstream

Change-Id: I3c45755eaa9aff180954f9db92f4ac3379862bf1