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

Change-Id: I25bdaa07f9cda4d7208ec09165343c99e9040f20