Merge "Exposed some testAPIs in BatteryStatsManager" into sc-dev