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

Change-Id: Idb7e69dc41377aae2b54698df420de2617c3f9c6