Merge tag 'android-security-13.0.0_r22' into HEAD

Android Security 13.0.0 Release 22 (12199512)

Change-Id: If8338f9530b788237ce55a1c9055e533671b857e