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

Change-Id: Ie50462c325f5a468451c85ec0ad5ceff855aa8c8