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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23983543', 'googleplex-android-review.googlesource.com/24323876', 'googleplex-android-review.googlesource.com/24309522', 'googleplex-android-review.googlesource.com/24424817'] into security-aosp-sc-v2-release.

Change-Id: I76f2e1f1247357cc9451c5831ff57447d85496bd