Merge cherrypicks of ['googleplex-android-review.googlesource.com/23583481'] into security-aosp-sc-release. Change-Id: Ief9dbdd9b4bc64132ffebd88208c987525f3ce79