Merge cherrypicks of [14947012, 14947430, 14947171, 14947470, 14947471, 14947013, 14947490] into security-aosp-pi-release

Change-Id: Ibd3cdcd1742622f369e8a9874a21ea8a8de7b05c