Merge changes Ide85480f,I438ab8be

* changes:
  WifiThreadRunner.prepareForAutoDispatch
  WifiServiceImplTest test timeouts
tree: f7e942aae34fdc13895dbccda17122b1fc78f39c
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg