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

Change-Id: Ia157adfaac5a74de2c3b6fec374217eb2f3a4049