Merge changes I2830f7d3,I6c5ac921

* changes:
  ClientModeManager: Remove unnecessary dependencies on ClientModeImpl
  ClientModeImpl: remove mWifiState
tree: 166b90c41f78372e3966a7ddac01ffc20e54b2ab
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg