Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548271',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548271', 'googleplex-android-review.googlesource.com/21548272', 'googleplex-android-review.googlesource.com/21548273'] into security-aosp-sc-v2-release.

Change-Id: I9b4231dbf4e852c4bfc3541f31057256c288f5fb