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

Change-Id: I44afca01f8325a2f4314b1c2798ea5e51f038a53