Android Security 13.0.0 Release 12 (10993242)
Merge cherrypicks of [19037861] into tm-release.

Change-Id: Icabf431dfa8f538e223b05dec2f02d79d105a04b