Android Security 13.0.0 Release 4 (9682190)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21224930', 'googleplex-android-review.googlesource.com/20659351'] into security-aosp-tm-release.

Change-Id: I8e910a3b7dc1803433abcc3399199c513564de2c