Merge "SystemServer: reorder wifi services start"
am: 10c514d9de

Change-Id: I3a918b707932084759701103c683fffed0e16cee