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

Change-Id: I072d69eefdbeae9b8c6103e46904c50215ceeeb9