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

Change-Id: Ifcc07cd2ebef31c9f5182b0c96ac0c672b3c7ed7