Android Security 12.0.0 Release 42 (9269288)
Merge cherrypicks of [20068332] into security-aosp-sc-release.

Change-Id: I712d7c0a82d8ca3b0a91e28b6dfcd98aa7c65441