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

Change-Id: Ifa5283497eb6ba4e7ae1d495a0c12c21782176f6