Merge "[Wi-Fi] Replace AccessPoint with WifiEntry for WifiDialog2"