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

Change-Id: I4828e9e975e5fcece39ada2827ff77567070066a