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

Change-Id: Ieca7009798a57b47ecfacf0f57db23f714ba954d