Merge "[MS60] Remove TrafficStats.TAG_SYSTEM_APP dependency"