Android security 12.0.0 release 37
Merge cherrypicks of [17829592] into security-aosp-sc-release.

Change-Id: Ib5618798f150e789c3ea8728df805cb51b3a76d4