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

Change-Id: I84912a58dea3f25bf1a980e1358d639ae3d5135e