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

Change-Id: I9864bb55b167248d15ba752f034cd8ec0e4c7f4e