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

Change-Id: I87d49039e6996ec1c1b1c8668463db65d50af359