Merge "Prevent calling requestTetheredInterface when using adb over ethernet" into main