Android Security 12.0.0 Release 38 (8712618)
Merge cherrypicks of [18492389] into security-aosp-sc-release.

Change-Id: Ie2e2930fa9eb64376b9d9c402d69b09e9ff2819b