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

Change-Id: I145648d443cd441ae41531f234ad7e68aa8b6175