Merge "Move TrafficStats tags for the network stack constants"