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

Change-Id: I775f7cff16fce2c42d05a71e2594271657134960