Merge cherrypicks of [16190719, 16510843] into security-aosp-rvc-release.

Change-Id: I90103d50b08b1a012748ec38a03c9206225aef94