Merge changes from topic 'onarevert' into oc-dev

* changes:
  Move ONA back into the wifi framework.
  Revert "Move WifiNotificationController to NetworkRecommendation"
tree: 139eb899867740a78202aac875301c68567e263e
  1. service/
  2. PREUPLOAD.cfg