Merge changes from topic "wifi-mainline-presubmit" into sc-dev

* changes:
  WifiInfo.isPrimary(): Add SdkLevel check
  Promote Wifi S-on-R tests to presubmit