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

Change-Id: If61584b5ee3e466e6cc930a3266add347a6d6181