Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861

Change-Id: Ideb5a5abbd074a8c905861e902977c442317fc02