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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24077613', 'googleplex-android-review.googlesource.com/25102101', 'googleplex-android-review.googlesource.com/25064728', 'googleplex-android-review.googlesource.com/23262449', 'googleplex-android-review.googlesource.com/24709428', 'googleplex-android-review.googlesource.com/25369997'] into security-aosp-rvc-release.

Change-Id: I790def75ba9f4938b7b87f4cbda3cd15d9b9ee05