Android security 13.0.0 release 9
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23505028'] into security-aosp-tm-release.

Change-Id: If7910020da20e8f6b67546203f85494827549b64