Merge "[Wi-Fi] Remove redundant code in WifiSettings2"