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

Android Security 13.0.0 Release 18 (11698590)

Change-Id: I236cc948844592ec294b9f4e7a6dbefe1b7ff0f7