Merge cherrypicks of [16009369, 16012240, 16012308, 16012309, 16012331, 16012215, 16012281, 16012282, 16012283, 16012332, 16012284] into security-aosp-pi-release

Change-Id: Ie559bf8ae45c054744e126e75132bed861d84818