Merge changes Ifd51b1fb,I014cb175 into sc-dev

* changes:
  Use NetworkScore to force keep up MBB STA
  Revert "Hack to force ConnectivityService to maintain 2 Wifi connections"