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

Change-Id: I638555ead5a7aabd7d24e0320cb54cacd39d50e3