Android security 12.0.0 release 49
Merge cherrypicks of ['ag/20611321'] into security-aosp-sc-release.

Change-Id: Ic1735a36d2aa6211692e6b64f65e9b5ca7e48431