Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bazel: Sort error prone check settings alphabetically

Change-Id: I9dd693f2686152aabaa9a08a970664e8d1ff3ecc
diff --git a/tools/BUILD b/tools/BUILD
index 569685c..d8eab02 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -85,8 +85,8 @@
         "-Xep:TypeParameterShadowing:ERROR",
         "-Xep:TypeParameterUnusedInFormals:ERROR",
         "-Xep:URLEqualsHashCode:ERROR",
-        "-Xep:UnusedException:ERROR",
         "-Xep:UnsynchronizedOverridesSynchronized:ERROR",
+        "-Xep:UnusedException:ERROR",
         "-Xep:WaitNotInLoop:ERROR",
         "-Xep:WildcardImport:ERROR",
     ],