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

Change-Id: Ia65a14a3dbacb7bf2702de57014159c774ca8b89