Merge cherrypicks of ['ag/20493625', 'ag/20540194', 'ag/20521188', 'ag/20612019'] into security-aosp-sc-release.

Change-Id: If097a0c66511affdda99744d77f5dad4acfba24c