Merge cherrypicks of [15624560, 16103659, 15975848, 15975849, 15975850, 16222361, 16190719, 16222704, 16214550] into security-aosp-rvc-release.

Change-Id: Id3a85132347ceee9a3b63acc7278add9732d0410