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

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

Change-Id: Iceeebd923880c2de81ff4a2b2146ec2b9e98803d