Merge "wifi: remove softap restore method since new API supported in R"