Merge cherrypicks of [17245462, 17129429, 17310817] into security-aosp-rvc-release.

Change-Id: Iddaab5f5a209f73b6892b193b9f5ba7c0840af8e