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

Change-Id: I0d71dcd01f895ecec8393f7e40c7e134faaa65e3