Merge cherrypicks of [16624024, 16612525, 16804648, 16743363] into security-aosp-rvc-release.

Change-Id: I61bac3e6df8ab71bfcd26ab6452d40d46ec949e4