Merge "[Wi-Fi] Support intent extra "wifi_enable_next_on_connect" in WifiSettings2"