[automerger skipped] Merge "Ensure config file for wpa_supplicant exists" into pi-dev
am: 14cece23e8  -s ours

Change-Id: I358aa8f092182b62a171cf875675ace90bdd9992