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

Change-Id: Ibff114c0d04693e0a426eb7e925a853334263fb8