Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev