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

Change-Id: Ia252d0838b95f17d3598fb370ca2e01d5294bbfa