Merge cherrypicks of ['ag/17630873', 'ag/18122582', 'ag/19868477',...

Merge cherrypicks of ['ag/17630873', 'ag/18122582', 'ag/19868477', 'ag/20404656', 'ag/20406274', 'ag/20302363', 'ag/19912168', 'ag/20541824', 'ag/20511627', 'ag/20591844', 'ag/20643109'] into security-aosp-sc-v2-release.

Change-Id: I3873c6069f260661b2ea5b5c96ce0120867ee265