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

Change-Id: I19dbed57dc2f13325a04f035f6d28b40c63621fe