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

Change-Id: I90b91590d75884d602f8286dbebefff54bdf0d81