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

Change-Id: I9b50de70270e83a90c58310f48c7c35d9d16cf45