Android Security 12.0.0 Release 40 (9039305)
Merge cherrypicks of [19419128, 19459610] into security-aosp-sc-release.

Change-Id: If072a3321bee3a65b867f52b89c4398483b3e238