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

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

Change-Id: I53ad3e4736e23124dfef3794f9eb08c02e50fad0