Merge changes from topic 'onarevert' into oc-dev

* changes:
  Create a NotificationChannel for ONA.
  Revert "Delete old WifiNotificationController strings."