[automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e4275659 am: 40b438ab am: 5b1b6bf2 -s ours am: 4cbbf1aa -s ours

am skip reason: skip tag Change-Id Ib667c115e5f1e01237d88b77bba753363da309cc with SHA-1 c03b2044 is already in history

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

Change-Id: I01d6dd5f5f8d016871771529b6fbe2ce934bf8b3