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

Change-Id: I49e05f34e882d5eff4e3bb00964ecd3cebd20427