Android Security 13.0.0 Release 2 (9402439)
Merge cherrypicks of [19734446] into security-aosp-tm-release.

Change-Id: Iae78b1f597834d68a38f57a4c8a0f63cf7bbf628