Merge "Support "dumpsys connectivity trafficcontroller""