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

Change-Id: I8b3c765aa5b4115d561c01e0d3d0038012a3c171