Merge "Move TrafficStats tags for the network stack constants"
am: 3444dd03d6

Change-Id: I13ba9e3077bb4ec28229a09f2d4747a43c281bcc