Merge changes I1d1f0d2d,Ifbd4a978 into sc-dev

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