Merge changes I1d1f0d2d,Ifbd4a978 into sc-dev

* changes:
  Communicate with BatteryStatsService through BatteryStatsManager
  Add a new API in BatteryStatsManager for connectivity service