Android Security 12.0.0 Release 58 (11422630)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24776869'] into security-aosp-sc-release.

Change-Id: I8c9442202d5e45d8bf33c1d0ad970d4934a4022d