Merge "Revert "Add onSupportedTetheringType callback""