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

Change-Id: Ibe8868e734c0605f72cd0c3839982c9fa382110e