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

Change-Id: I14caaa86b5d6b4a7a5c18bc8b1d7c8ee2278785c