Merge "init: Update wpa_supplicant service parameters" into cm-11.0

Change-Id: I6bb108b181869fe348fe00ef07e9a358766e59af