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

Change-Id: I8290266c7ac51a2edd359df22fd94eb396d1e5dc