Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" into sc-dev