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

Change-Id: I9df50971d4501db9b4a491ae0903376498cec253