Merge "Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag." am: 00326a8902 am: 935bacec4a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503394

Change-Id: I43a09e2c3fbaa93b700b7e028aecf2b5a20e74bd

core/java/android/os/strictmode/UntaggedSocketViolation.java

@@ -18,7 +18,7 @@ package android.os.strictmode;
 public final class UntaggedSocketViolation extends Violation {
     /** @hide */
     public UntaggedSocketViolation() {
-        super("Untagged socket detected; use TrafficStats.setThreadSocketTag() to "
+        super("Untagged socket detected; use TrafficStats.setTrafficStatsTag() to "
                 + "track all network usage");
     }
 }