Merge branch 'master' into robolectric-4.11.x

.github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0068402..3bb3e24 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,3 +9,8 @@
     directory: "/"
     schedule:
       interval: "weekly"
+    ignore:
+       # don't auto update guava since it requires updating gradle
+       - dependency-name: "*guava*"
+       # don't auto update errorprone since it requires updating guava
+       - dependency-name: "*errorprone*"

gradle/libs.versions.toml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dfb7ce8..ff8c9f0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@
 aggregate-javadocs-gradle = "3.0.1"
 
 # https://github.com/google/error-prone/releases
-error-prone = "2.22.0"
+error-prone = "2.19.1"
 error-prone-javac = "9+181-r4173-1"
 
 # https://github.com/tbroyer/gradle-errorprone-plugin/releases
@@ -54,7 +54,7 @@
 compile-testing = "0.21.0"
 
 # https://github.com/google/guava/releases
-guava-jre = "32.1.3-jre"
+guava-jre = "31.1-jre"
 
 # https://github.com/google/gson/releases
 gson = "2.10.1"