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

Change-Id: Ic98ee35e8c1cfd13a26be606c11777ef5021a550