Sync the wpa_supplicant.conf and p2p_supplicant.conf from P23 Bug: 312933598 Test: Build passed Change-Id: Ic86fc69ca4ef8b0349f6444dfc88562130ba2911
based on 84d60a2e19d4ad09086067994d2f683ff86f6231 Bug: 263919239 Change-Id: I7be43786325116baddd35e182f87ad15fbe1a6ce