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

Change-Id: I327d49a63916461e6a69a9988cc3168c59242d56