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

Change-Id: If94811121eccf1f3e78347ac7f658163fdf8b888