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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23892861', 'googleplex-android-review.googlesource.com/23918399', 'googleplex-android-review.googlesource.com/24420753', 'googleplex-android-review.googlesource.com/20065167', 'googleplex-android-review.googlesource.com/24046929', 'googleplex-android-review.googlesource.com/24341231', 'googleplex-android-review.googlesource.com/23623109', 'googleplex-android-review.googlesource.com/24607942', 'googleplex-android-review.googlesource.com/24182288', 'googleplex-android-review.googlesource.com/24761005', 'googleplex-android-review.googlesource.com/24058898', 'googleplex-android-review.googlesource.com/24805807', 'googleplex-android-review.googlesource.com/24640919'] into security-aosp-rvc-release.

Change-Id: I3f07490349dd0323351c2194a600e1ec5e84b8ce