Android security 13.0.0 release 17
Merge cherrypicks of [19095730, 19124856] into tm-release.

Change-Id: I7bb4647c2f94070c1570b925b1ac1b69f868f48d