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

Change-Id: I707d0ce242f8bc82537e738eb75294a28392ba1a