Merge "Move wpa_supplicant.conf from /system to /vendor"