Merge changes I15fc6862,I9f51c873

* changes:
  WifiStateMachineTest: use a real Clock
  WifiStateMachine: inline printTime()
tree: 5b4f18473476bfad139e306b613f8bff4807be6a
  1. libwifi_hal/
  2. libwifi_system/
  3. service/
  4. tests/
  5. PREUPLOAD.cfg