Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I9626e93f61badaf8e9078d360ce19c2d7017bc51

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 243642d..8cc1197 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@
 def external_plugin_deps():
     maven_jar(
         name = "mockito",
-        artifact = "org.mockito:mockito-core:2.24.0",
-        sha1 = "969a7bcb6f16e076904336ebc7ca171d412cc1f9",
+        artifact = "org.mockito:mockito-core:2.24.5",
+        sha1 = "599509fe319bd9e39559b8f987bee5d4b77167e4",
         deps = [
             "@byte-buddy//jar",
             "@byte-buddy-agent//jar",