Merge "Update import class from TrafficStatsConstants to NetworkStackConstants" am: b0b2e6aa67 am: 572a4c75ce Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1626099 Change-Id: I0039fe653d257c69826d80faf1e883ae5308c9a1