Merge "Merge "Revert "Build FrameworkStatsdTest test against the sdk"" into rvc-dev am: 2d76bb60fe am: dd2f86b8ac" into rvc-d1-dev-plus-aosp am: c697e85542 am: 80c90b6c50

Change-Id: I9186e9adfa113024c8d9ac842d6aed5c77eafa0a

apex/statsd/framework/Android.bp

@@ -166,8 +166,10 @@ java_library {
 
 android_test {
     name: "FrameworkStatsdTest",
-    sdk_version: "module_current",
+    platform_apis: true,
     srcs: [
+        // TODO(b/147705194): Use framework-statsd as a lib dependency instead.
+        ":framework-statsd-sources",
         "test/**/*.java",
     ],
     manifest: "test/AndroidManifest.xml",
@@ -178,7 +180,6 @@ android_test {
     libs: [
         "android.test.runner.stubs",
         "android.test.base.stubs",
-        "framework-statsd",
     ],
     test_suites: [
         "device-tests",