Merge "Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag."