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

Change-Id: I77cd1c4cd6cbc3962779bae9141641fa1be06c39