wifi: update {wpa,p2p}_supplicant services init

Change-Id: I9386392b90c1e9ad792a1a1f4145bd01f77cdd13
Merge "wifi: update {wpa,p2p}_supplicant services init" into cm-11.0