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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23983047', 'googleplex-android-review.googlesource.com/24324114', 'googleplex-android-review.googlesource.com/24309763', 'googleplex-android-review.googlesource.com/24181420', 'googleplex-android-review.googlesource.com/24424817'] into security-aosp-rvc-release.

Change-Id: Id39cacf2271b29c8cbaf21b8dd45543ce56e46c2