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

Change-Id: Ia27a671e3b0f0a4a8b12c6a3404582c846394f6b