Android security 13.0.0 release 13
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24879207', 'googleplex-android-review.googlesource.com/25096450'] into security-aosp-tm-release.

Change-Id: Ia441b5fecb0cab90ba3c0ce1401a1831ba87238e