Merge "Tethering: remove dead code" am: abc0246c4f am: 26ddce1db9 am: 8aee835b45 am: bd32e37e06 am: 3767bb480e

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

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