Remove deprecated TrafficStats API.

Bug: 5314214
Change-Id: If7dc3ef012a0e998e83ab4fef27ff19398d3e14c
diff --git a/api/current.txt b/api/current.txt
index 69e1cd5..b68f6d9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11765,7 +11765,6 @@
     method public static void incrementOperationCount(int);
     method public static void incrementOperationCount(int, int);
     method public static void setThreadStatsTag(int);
-    method public static deprecated void setThreadStatsTag(java.lang.String);
     method public static void tagSocket(java.net.Socket) throws java.net.SocketException;
     method public static void untagSocket(java.net.Socket) throws java.net.SocketException;
     field public static final int UNSUPPORTED = -1; // 0xffffffff
diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java
index ec3b1e1..47cfa73 100644
--- a/core/java/android/net/TrafficStats.java
+++ b/core/java/android/net/TrafficStats.java
@@ -104,14 +104,6 @@
         return NetworkManagementSocketTagger.getThreadSocketStatsTag();
     }
 
-    /**
-     * @deprecated unsupported, will eventually be removed
-     */
-    @Deprecated
-    public static void setThreadStatsTag(String tag) {
-        setThreadStatsTag(tag.hashCode());
-    }
-
     public static void clearThreadStatsTag() {
         NetworkManagementSocketTagger.setThreadSocketStatsTag(-1);
     }