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

Change-Id: I528c2043c1cfccf42643267221e5a57019e5efb5