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

Change-Id: Ib3adbff1cf06a8bc71c826d8ad26254e516101b2