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

Change-Id: I5b5c1423325792e448f89ebbac6c3549a725ba27