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

Change-Id: I072529bf9629733cc0a7ea86693eed9a0aba9927