Merge changes from topic "framework-wifi-icon-sameas"

* changes:
  Remove OsuProvider#mIcon
  SettingsLibTest: Remove OsuProvider#mIcon