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

Change-Id: Ibadb39282392ded3d1dde593f8d1aa616c6ebf53