Merge cherrypicks of [15539627, 15541570, 15541571, 15541572, 15541573, 15541574] into security-aosp-pi-release

Change-Id: Icbf31d243863a6dbbff899d015cda55c5f7a9c14