Merge changes I2bc7a9c5,I691781b1 into sc-dev

* changes:
  startDppAsEnrolleeResponder tests: check isAtLeastS()
  WifiServiceImpl subsystem restart APIs: check isAtLeastS()