Revert "Remove content/ CriteriaNotSatisfiedException"

This reverts commit 9f35be80.

Reason for revert: clank rolls all failed, not sure why the clank bot I added didn't fail on my change.

Original change's description:
> Remove content/ CriteriaNotSatisfiedException
>
> Part 3 of a 3-sided change to move CriteriaNotSatisfiedException to
> base/
>
> Bug: 1134178
> Change-Id: Ie76869351d8a09bd92205e3aef3ffea65220c01a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2515520
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#823553}

TBR=yfriedman@chromium.org,mthiesse@chromium.org

Change-Id: I0ae020b9af62053f500a9f304c8fb9f9552c657e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1134178
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517382Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823575}

content/public/test/android/BUILD.gn

@@ -45,6 +45,7 @@ android_library("content_java_test_support") {
     "javatests/src/org/chromium/content_public/browser/test/util/Coordinates.java",
     "javatests/src/org/chromium/content_public/browser/test/util/Criteria.java",
     "javatests/src/org/chromium/content_public/browser/test/util/CriteriaHelper.java",
+    "javatests/src/org/chromium/content_public/browser/test/util/CriteriaNotSatisfiedException.java",
     "javatests/src/org/chromium/content_public/browser/test/util/DOMUtils.java",
     "javatests/src/org/chromium/content_public/browser/test/util/DomAutomationController.java",
     "javatests/src/org/chromium/content_public/browser/test/util/HistoryUtils.java",

content/public/test/android/javatests/src/org/chromium/content_public/browser/test/util/CriteriaNotSatisfiedException.java

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.content_public.browser.test.util;
+
+/**
+ * Exception indicating that a Criteria did not match expectations.
+ */
+public class CriteriaNotSatisfiedException
+        extends org.chromium.base.test.util.CriteriaNotSatisfiedException {
+    /**
+     * @param msg The reason the criteria was not met.
+     */
+    public CriteriaNotSatisfiedException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * @param cause The underlying exception that prevented the Criteria.
+     */
+    public CriteriaNotSatisfiedException(Throwable cause) {
+        super(cause);
+    }
+}