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

Change-Id: I9776873af598eaf9c9a228ddbea00d1db6dd2e1f