Android Security 13.0.0 Release 6 (10026668)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22348680'] into security-aosp-tm-release.

Change-Id: Ibe9caf7eec6e892b60384be47ec1ba1ccb0b7048