Merge "Remove unused functions in TrafficController" am: ea95231d63 am: 1fffc1d842 am: bd7288b0cf

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

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