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

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

Change-Id: I3d922ce8bf6f8c8b14e91f8729c8fa6d44b1af30