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

Android Security 13.0.0 Release 24 (12496786)

Change-Id: I738356a139e3872774f920a5199744577926bbb6