Merge cherrypicks of ['googleplex-android-review.googlesource.com/21804481', 'googleplex-android-review.googlesource.com/21804480'] into security-aosp-sc-release. Change-Id: Ia261fcc70a0bf37fe8c48c4683a28e9aaa3c4d81