Merge change 6735

* changes:
  WifiService: Remove hidden AP counting logic for active/passive scanning mode.