Change package of StatsdStatsLog

Change package of StatsdStatsLog from com.android.internal.util to
com.android.internal.statsd

Test: atest GtsStatsdHostTestCases
Bug: 157649935
Change-Id: Iee2af03c950b7cc054f7d77e721694a7f429ae9d
diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index 78496c4..19f0e6f 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -20,8 +20,8 @@
     name: "statslog-statsd-java-gen",
     tools: ["stats-log-api-gen"],
     cmd: "$(location stats-log-api-gen) --java $(out) --module statsd" +
-         " --javaPackage com.android.internal.util --javaClass StatsdStatsLog",
-    out: ["com/android/internal/util/StatsdStatsLog.java"],
+         " --javaPackage com.android.internal.statsd --javaClass StatsdStatsLog",
+    out: ["com/android/internal/statsd/StatsdStatsLog.java"],
 }
 
 java_library_static {
@@ -65,7 +65,7 @@
         "android.os",
         "android.util",
         // From :statslog-statsd-java-gen
-        "com.android.internal.util",
+        "com.android.internal.statsd",
     ],
 
     api_packages: [
diff --git a/apex/framework/java/android/util/StatsLog.java b/apex/framework/java/android/util/StatsLog.java
index 4eeae57..0a9f4eb 100644
--- a/apex/framework/java/android/util/StatsLog.java
+++ b/apex/framework/java/android/util/StatsLog.java
@@ -28,7 +28,7 @@
 import android.os.Process;
 import android.util.proto.ProtoOutputStream;
 
-import com.android.internal.util.StatsdStatsLog;
+import com.android.internal.statsd.StatsdStatsLog;
 
 /**
  * StatsLog provides an API for developers to send events to statsd. The events can be used to