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