Merge cherrypicks of ['ag/20069005', 'ag/20834832', 'ag/20857269', 'ag/20874088', 'ag/20857271'] into security-aosp-rvc-release.

Change-Id: I08f2501907ef82f14fc2b50c43214981f9ef21ad