Android security 12.0.0 release 41
Merge cherrypicks of [16371866] into security-aosp-sc-release.

Change-Id: I4d792ea1e12958726509b9eee9735600695e659b