[automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: 5c520a3650 am: 348a73f1f0 am: 0896806110 -s ours

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

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

Change-Id: Ia90d90c5bf7429ad2a7f50d6e055f6dec28f3ea9
tree: ba7319d0fd4b2b3283f4b3fb39159ac9be3d38ee
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING