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

Change-Id: I61a355a158c12ef32dea27662ea00b7258601737