Merge "[Wi-Fi] Replace some WifiEntryShell methods with WifiEntry version"