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

Change-Id: Ic9fd6d886f30eedd8b15a2fd519a9fc887ac5453