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

Change-Id: Ie5879ef56a46f5f173e4db4c5f3745570e44eff2