Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev