Android security 12.0.0 release 41
Merge cherrypicks of [19370567, 19868792] into security-aosp-sc-release.

Change-Id: I39f5fedf4910be949b11e21c3190de2dab7fa8dd