Merge "[NETD-TC#13] Make TrafficControllerTest as traffic_controller_unit_test" am: a92465745c am: c994eb6229

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

Change-Id: If53241c8392f8011dfcd2d49f42549d7638a7733