Android Security 12.0.0 Release 48 (10026669)
Merge cherrypicks of [16511961] into security-aosp-sc-release.

Change-Id: I00f67bd43fb924d46d0f6a2efc2a0e71bc4c2791