Android security 13.0.0 release 9
Merge cherrypicks of ['ag/20639573'] into security-aosp-tm-release.

Change-Id: I99dc0f7698b3e66ab607874cadd9ec2deb721b8b