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

Change-Id: I4e144644ca9c48fbb0cd42d9b944a1bb4b8205e0