Merge "Remove unnecessary arguments from isTetheringFeatureEnabled" into main