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

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

Change-Id: I5c88344a05194ad77de541a3b5cadcdf4cc05d85