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

Change-Id: I04b0a169c909b23eed028c0fe65941d6748f9cda