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

Change-Id: I48a3bff17dd4c085863e17379226fdd3026332b3