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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20342565', 'googleplex-android-review.googlesource.com/23687079', 'googleplex-android-review.googlesource.com/23728043', 'googleplex-android-review.googlesource.com/23892861', 'googleplex-android-review.googlesource.com/23883016', 'googleplex-android-review.googlesource.com/23834099'] into security-aosp-rvc-release.

Change-Id: I5e9a42a8c5a5a7d276b09edceb8ecf640d3cc13d