Merge cherrypicks of [17416247, 17416248, 17416249, 17416250, 17452194, 17874414, 17864680] into security-aosp-rvc-release.

Change-Id: I2f6c72a9a9ab7c22c481e167f1215ffcf29028de