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

Change-Id: Id44c6221641b3332df5fcec00df509c546180dd0