Merge "Cleanup dead code in TrafficControllerTest" am: 551f761e9b am: 476aaf504d

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

Change-Id: Ib82da3c8bba7133683ff8f5b4315511a5de7bbdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>