Merge changes I1d1f0d2d,Ifbd4a978

* changes:
  Communicate with BatteryStatsService through BatteryStatsManager
  Add a new API in BatteryStatsManager for connectivity service
tree: c4f1aebfb153f3467cbd78383bf66b80db8124fb
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS