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

Change-Id: Ia53fe1538294fe828cf5eee425a4b9efaf2db7f7