Merge changes I1169c59b,Iea1337ae

* changes:
  [WifiController] Log message names, not numbers
  [ClientModeImpl] Remove MessageUtils use
tree: fe56eb9b6166c4ddae8ad5b4cd528678caf353c9
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg