Merge "init: Update wpa_supplicant service parameters" into cm-11.0
(cherry picked from commit fa7f881998333debfa6dc5494d586f33ba92086f)