Merge cherrypicks of ['googleplex-android-review.googlesource.com/20315707', 'googleplex-android-review.googlesource.com/23515301'] into security-aosp-rvc-release.

Change-Id: I85a6405bf5c69afc2bb223448ecf9f0ead8ef817