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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28885197', 'googleplex-android-review.googlesource.com/29119611', 'googleplex-android-review.googlesource.com/29595549', 'googleplex-android-review.googlesource.com/29956991', 'googleplex-android-review.googlesource.com/30024285'] into security-aosp-sc-v2-release.

Change-Id: I6c79d84258fbbfcbee01021018ab0eb544632f55