Android Security 13.0.0 Release 16 (11422632)
Merge cherrypicks of ['ag/20330791'] into security-aosp-tm-release.

Change-Id: Ib3401821b51dfb40735f33127b4345053d7a1722