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

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

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