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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21027192', 'googleplex-android-review.googlesource.com/23483079', 'googleplex-android-review.googlesource.com/23769826', 'googleplex-android-review.googlesource.com/23877020', 'googleplex-android-review.googlesource.com/23792288', 'googleplex-android-review.googlesource.com/23846296', 'googleplex-android-review.googlesource.com/23835332', 'googleplex-android-review.googlesource.com/24029386', 'googleplex-android-review.googlesource.com/23424576', 'googleplex-android-review.googlesource.com/24057913', 'googleplex-android-review.googlesource.com/23918603', 'googleplex-android-review.googlesource.com/24301483', 'googleplex-android-review.googlesource.com/24271007'] into security-aosp-rvc-release.

Change-Id: If88d9136fc3fcabb6f34b5a7611d0aa5c8967c90