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

Change-Id: Ie24898686ef2f6b424055eab596d39dd00f9a34d