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

Change-Id: Ie3a270228bf375889f74769f89c292dcc46da8bc