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

Change-Id: Ic420fdc2b7b454e12f77513baf319300b8fe9595