Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" into sc-dev am: 75b14b13 am: a0aaa390

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

Change-Id: Ie2b15dd41b0ea47e140acf6b55d0b31a62d55675