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

Change-Id: I209a1d01c5a08e3f1dc9b063713fe5193272c01c