Android security 13.0.0 release 17
Merge cherrypicks of [19121301] into tm-release.

Change-Id: Ia76e950a27f3787d6ea1dc4a02c1c9f90a3458bf