Merge "Update import class from TrafficStatsConstants to NetworkStackConstants"