Merge "Revert "Add experiment flag for tethering refactor"" into main am: e48d106863 am: 671e11722e

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

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