[automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc am: 5b1b6bf264 -s ours

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

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

Change-Id: Ia90d90c5bf7429ad2a7f50d6e055f6dec28f3ea9