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

Change-Id: Ia7fda0ccf6ce83380eba7b666ccee69c04733237