Merge cherrypicks of ['ag/19744482', 'ag/19868480', 'ag/20404106', 'ag/20406267', 'ag/20307961', 'ag/20541824', 'ag/20532079'] into security-aosp-qt-release.

Change-Id: Ie9c6d1f8c78bfabfadd7b2ecff31311434cb43a2