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

Change-Id: I3c2aa91f49b451a9901ba3a44aef4b38bc0d4540