Merge cherrypicks of [16565827, 16572034, 16531386, 16600886, 16602652] into security-aosp-rvc-release.

Change-Id: I0e600593cbdaabde0c558cc314cf9e2285a6e9e2