Android security 13.0.0 release 30
Merge cherrypicks of ['googleplex-android-review.googlesource.com/31157214', 'googleplex-android-review.googlesource.com/31395374'] into security-aosp-tm-release.

Change-Id: Ie35ea8f8c7fd2247b53c6a832cb6056f4b14ce53