Merge "[WifiDialog] Guard with CHANGE_WIFI permission"