Revert "Revert "Generate stable version of NetworkStackStatsLog""

This reverts commit da5f6bb279ea7b11aafbde45299f3b9b4ff59f7d.

Reason for revert: Revert of a revert. The failure which caused the original revert has been fixed in ag/13536598.

Test: Run failing mainline_qt_boottime_test in Forrest:
go/forrest-run/L37000000812186599

Change-Id: I1cf189ce34905f9ab587a04f9aa198471122489f
diff --git a/Android.bp b/Android.bp
index 951b160..17b57c9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -111,7 +111,7 @@
     srcs: [
         ":NetworkStackApiCurrentShims",
         "src/**/*.java",
-        ":statslog-networkstack-java-gen"
+        ":statslog-networkstack-java-gen-current"
     ],
     manifest: "AndroidManifestBase.xml",
 }
@@ -130,7 +130,7 @@
     defaults: ["NetworkStackReleaseApiLevel"],
     srcs: [
         "src/**/*.java",
-        ":statslog-networkstack-java-gen",
+        ":statslog-networkstack-java-gen-stable",
     ],
     // API stable uses a jarjared version of the shims
     static_libs: [
@@ -261,14 +261,24 @@
 }
 
 genrule {
-    name: "statslog-networkstack-java-gen",
+    name: "statslog-networkstack-java-gen-current",
     tools: ["stats-log-api-gen"],
     cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +
          " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +
-         " --supportQ",
+         " --minApiLevel 29",
     out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],
 }
 
+genrule {
+    name: "statslog-networkstack-java-gen-stable",
+    tools: ["stats-log-api-gen"],
+    cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +
+         " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +
+         " --minApiLevel 29 --compileApiLevel 30",
+    out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],
+}
+
+
 version_code_networkstack_next = "300000000"
 version_code_networkstack_test = "999999999"