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

Change-Id: Ib7d58c62582086a6bad55e3c3ef34a660dae57bd