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

Change-Id: I1e030b37aec562d452ce9fae9eb417531b17a39d