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

Change-Id: I0fbcaa8da45eca393bd9e289f5d0fbddbe738669