Merge "Revert "Add experiment flag for tethering refactor"" into main am: e48d106863 am: 9c81affa48

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

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