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

Change-Id: Ic489520492e296f8fedc7feea626622d92f2ec82