Merge changes Id634a42d,I83c988de into sc-dev

* changes:
  [RequiresApi] Add annotation for WifiAvailableChannel APIs
  [RequiresApi] Add annotation for S API