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

Change-Id: Ida019f679d8a1ccd9c60a05f1cbaff696908e1bd