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

Change-Id: Ib14bb1d0d0e177af861125f7763af37bcb45cbf8