Merge cherrypicks of [15800877, 15799943, 15800878, 15799944, 15800879, 15800987, 15800365, 15799765] into security-aosp-pi-release

Change-Id: Ic3c4f19357cda31bb0d8d5753e9eb9e1888ba519