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

Change-Id: Ic45a9d021dff57c950532fcc99ecd8da16209272