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

Change-Id: Iddd589a89d71d31f3c1255e2f2c00693c48a65d6