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

Change-Id: Ib6eb1452d18a211b27ceb45466245d121007cd1b