Merge cherrypicks of ['googleplex-android-review.googlesource.com/25135945'] into security-aosp-rvc-release. Change-Id: Ib8a3fda0093648de0e176228c119e2dcab6460d4