Merge "Deprecate supplicant related stuff in WifiManager"