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

Change-Id: I65dd2f3995791eea2ac7fc0f664b1855a357be40