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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22621733', 'googleplex-android-review.googlesource.com/24413973', 'googleplex-android-review.googlesource.com/24656668', 'googleplex-android-review.googlesource.com/24865306', 'googleplex-android-review.googlesource.com/25174238', 'googleplex-android-review.googlesource.com/25238611'] into security-aosp-rvc-release.

Change-Id: I69c905ff6053e830f888f0745b4d4e92a9ffb2d3