Merge "SystemServer: reorder wifi services start" am: 10c514d9de am: eae39fd1ec
am: 5c00ee28b2

Change-Id: Id6eb74c4aab2cd25f1d7adff4ddff160f6132fc6