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

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

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