Relandx2 "[BrowserFragment] Add minimum setup to run instrumentation tests"

Reverted CL: crrev.com/c/3959680

Difference: PS1 -> PS2

Add a dependency would should hopefully resolve the r8 compilation errors on some builders.

> [BrowserFragment] Add minimum setup to run instrumentation tests
>
> The instrumentation tests run in the shell app and have access to the BF
> public API.
>
> This is based on the weblayer instrumentation tests.
>
> For now, the tests run with the support apk, and the BF shell in local
> mode.
>
> Also re-enable the unit tests.

Bug: 1375991

Change-Id: I6d99f3836a2343278a6bfc71f387f91dfb30e2b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3961474
Reviewed-by: Susanne Westphal <swestphal@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1060469}

diff --git a/BUILD.gn b/BUILD.gn
index a6b18de..3f7b9ae 100644
--- a/BUILD.gn
+++ b/BUILD.gn

@@ -218,6 +218,13 @@
     ]
   }
 
+  if (is_android) {
+    deps += [
+      "//weblayer/browser/android/javatests:browserfragment_support_instrumentation_test_apk",
+      "//weblayer/browser/java:weblayer_junit_tests",
+    ]
+  }
+
   if (!is_ios && !is_android) {
     deps += [
       "//components/cronet:cronet_tests",