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

Change-Id: Id3335e8982ed44be64cd9c73179f3ad8a2ad1fc8