Merge "TrafficController - remove dead code" into main am: 02c6061cf8

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

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