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

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

Change-Id: I297354932cf08989df95e50ba3c04c12ae7e8d40