Android security 12.0.0 release 39
Merge cherrypicks of [16905018] into security-aosp-sc-release.

Change-Id: Ica13db8ea53eb12175ffbde9fe084b3ff3cf3ff7