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

[automerger skipped] Merge "Update import class from TrafficStatsConstants to NetworkStackConstants" am: b0b2e6aa am: 572a4c75 am: 11823448 -s ours am: 4fdbcfe1 -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: I44ffc953e06244296144de632f867c29f2512283