Merge changes I1c3da844,I6ff7a104

* changes:
  WifiScanningService: Process getAvailableChannels on main thread
  WifiServiceImpl: Check for null pointer in updateSoftApCapability
tree: b4feaef8e403a2eee0023b6deb1c4349f2cd8b25
  1. apex/
  2. service/
  3. PREUPLOAD.cfg