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

Change-Id: I3ec1f1242fe36caca5818ff5676b102b31c86127