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

Change-Id: I3e892e959659b1421f9ea7b3654f5d3656f4df19