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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24664788', 'googleplex-android-review.googlesource.com/24865582', 'googleplex-android-review.googlesource.com/24665127', 'googleplex-android-review.googlesource.com/25175743', 'googleplex-android-review.googlesource.com/25238611', 'googleplex-android-review.googlesource.com/25124582', 'googleplex-android-review.googlesource.com/25301258'] into security-aosp-sc-v2-release.

Change-Id: Iabf743ddc910713729cf060222d97ca0a2303e69