Merge "wifi: Removing reference to IServiceManager.h."