Android security 13.0.0 release 7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22235906', 'googleplex-android-review.googlesource.com/22861203'] into security-aosp-tm-release.

Change-Id: Ib65755b2492294f5b432643751f303ffd773224b