Merge changes I83c15c65,If3d51fb5

* changes:
  Wifi Notifiers: remove duplicate logic for finding Settings package name
  service-wifi: remove references to getWifiStackPackageName