Merge changes I2d5d4e41,Id69e077d

* changes:
  ActiveModeWarden: Add Primary CMM changed callback
  ConcreteClientModeManager: remove direct access to mClientModeImpl
tree: 806447738ef09e92179461b71abdee193b7c6522
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg