Android security 13.0.0 release 3
Merge cherrypicks of [19980641, 20100213] into security-aosp-tm-release.

Change-Id: I9c6422df41697952820db2125c034322828ebaf6