Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev