Sync the wpa_supplicant.conf and p2p_supplicant.conf from P23 Bug: 312933598 Test: Build passed Change-Id: I82d4ee371d5e2c981fbecbec09fb090a64f16296
Bug: 291867277 Change-Id: Ia7d34e6ab34bdd03406391f98c58b04eb77671cd