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

Change-Id: I9e4e556691c279d34a3b85dee2ab67d149801825