Merge "Move some Tethering code to SettingsLib to share"