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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21027271', 'googleplex-android-review.googlesource.com/23497629', 'googleplex-android-review.googlesource.com/23769813', 'googleplex-android-review.googlesource.com/23877020', 'googleplex-android-review.googlesource.com/23785419', 'googleplex-android-review.googlesource.com/23847203', 'googleplex-android-review.googlesource.com/23835332', 'googleplex-android-review.googlesource.com/23423703', 'googleplex-android-review.googlesource.com/24057913', 'googleplex-android-review.googlesource.com/23981526', 'googleplex-android-review.googlesource.com/24300600', 'googleplex-android-review.googlesource.com/24273139'] into security-aosp-sc-v2-release.

Change-Id: I42f279472568f5f0588b2fbb55e26c516fe7ec7a