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