Merge "wpa_supplicant: Free config only if it was allocated in same call" am: eecc4372ad
am: 4c83da0838

Change-Id: Ib1d027460aeaa7bf4537a72397b8860f0f76555e