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

Change-Id: I93f4f297765c950ab03057674dfd46577e433ad2