Merge cherrypicks of [16873394, 16811765, 16371387, 17089346, 17112304] into security-aosp-rvc-release.

Change-Id: I8b72dbaa21562144b6555532ff531a5edd22b3a5