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

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

Change-Id: I1004128862e64979395bd79b66f36b085ef5d030