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

Change-Id: Ia6564b12041cfd0a5ba4b4cb02f27487a62344c6