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

Change-Id: I43b74ce6ce49adc765e497a3d711412deb16451c