[automerger skipped] Merge "Update import class from TrafficStatsConstants to...

[automerger skipped] Merge "Update import class from TrafficStatsConstants to NetworkStackConstants" am: b0b2e6aa am: 572a4c75 am: b2e80108 -s ours am: 1ef7c75d -s ours

am skip reason: skip tag Change-Id Iaab5d721bb3b9536f560ad12436530150e03c370 with SHA-1 a7864ac5 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1626099

Change-Id: Iebf7af46b50aa75d58865a17d0c94218074d9e71