Merge cherrypicks of [16206383] into security-aosp-rvc-release.

Change-Id: Iffe0c80f4c954e11959a5a235b5f27b34f1027bb