Merge changes I4a7216f2,I4648a23c,Ifa634665

* changes:
  WifiMetrics: track iface of StaEvents
  CMI/WifiScoreReport: make ifaceName/CMM final
  Adaptive Connectivity Toggle ContentObserver - move to separate class
tree: a7c8ecf474ded506d76bc64fb40af2eba3089e00
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg