Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants"