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

Change-Id: Ie38b82c4fb5b4e377019ca8afdfe7231805e4eaf