GitLab

Added keeps required to keep Mockito happy - revert happened here:
https://crbug.com/1056619.

This is a reland of 2d6ff560

Original change's description:
> Roll R8 2.0.2 -> 2.1.8
>
> I checked to ensure crbug.com/1050440 was fixed.
> https://issuetracker.google.com/149831282
>
> Bug: 1040534
> Change-Id: I3894f4316f2dde2527a35ad6e919ee8cdc86c2b9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2075039
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Auto-Submit: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#744708}

Bug: 1040534
Change-Id: Ia991b83ef942d6655f9e1ba561ab1b407025ccae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2078591
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745189}