Merge "SystemServer: reorder wifi services start" am: 10c514d9de am: eae39fd1ec am: 5c00ee28b2
am: 844e5436a6  -s ours

Change-Id: I850b8a881ade0bdf2ea3a3de3ccfefa74e72dd51