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

Change-Id: I1ed2fb841700fe62db2730ab335c6f79acd0fbaa