Android security 13.0.0 release 9
Merge cherrypicks of [19911435] into security-aosp-tm-release.

Change-Id: I629119a005997895b8efd08b8694c4dc1423ce08