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

Change-Id: Ic8d1f5b6da6659973134bc594a6d05ecccb15f2d