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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23905843', 'googleplex-android-review.googlesource.com/23918399', 'googleplex-android-review.googlesource.com/24420396', 'googleplex-android-review.googlesource.com/20065164', 'googleplex-android-review.googlesource.com/24575248', 'googleplex-android-review.googlesource.com/24046929', 'googleplex-android-review.googlesource.com/24342147', 'googleplex-android-review.googlesource.com/23623415', 'googleplex-android-review.googlesource.com/24605806', 'googleplex-android-review.googlesource.com/24182288', 'googleplex-android-review.googlesource.com/24757286', 'googleplex-android-review.googlesource.com/24058898', 'googleplex-android-review.googlesource.com/24805388', 'googleplex-android-review.googlesource.com/22465294', 'googleplex-android-review.googlesource.com/24559329'] into security-aosp-sc-v2-release.

Change-Id: I2db16dcaf923d7db3f5db3fe8d6423ac866d000c