Merge cherrypicks of [16961349, 17186290, 17046136, 17343925, 17408864, 17591190, 17591530, 16908080, 17614780] into security-aosp-rvc-release.

Change-Id: I47e20d457154fa79820017454ec6034645ffb1d5