Merge cherrypicks of [16264331, 16379914, 16012418, 16406531] into security-aosp-rvc-release.

Change-Id: I55dd2707ff3961f4b8f1491fa7935c89f74b67ca