Merge changes I6160265b,Iadbfb08a into sc-dev

* changes:
  WifiNetworkSuggestionsManager: Allow settings app to bypass approval
  Fix unit tests to run on R