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

Change-Id: Ica6330de4d64e213e535c220f0c4298a5351166e