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

Change-Id: I4b2f7bcd6ca429c5562077f4700634d6b9a546ac