Merge "Ensure config file for wpa_supplicant exists"
am: ac6b90bc7c

Change-Id: I878cf048387158d9f91f285330f3d11a6f669d25