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

Change-Id: I10a1309a25b0ee506585d79be52f3c14ed9877ac