[automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: b819104190 am: 82c7b482d2 am: 6c7432b6df -s ours

am skip reason: skip tag Change-Id I7b3a6ba6283a72cc3f2a727001f0f581dce5a7c0 with SHA-1 e0152d3458 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1625962

Change-Id: I6a9c336e576096128a4902a7533dc6b644a85cfc
tree: 194c70c16809bf12aec4643037ed713cefc6ee70
  1. staticlibs/