Merge "WifiManager: remove Executor-less overloads"