Merge "Convert MobileRadioPowerCalculator to work with BatteryUsageStats"

core/java/android/os/BatteryConsumer.java

core/java/android/os/SystemBatteryConsumer.java

core/java/com/android/internal/os/BatteryStatsImpl.java

...a/com/android/internal/os/MobileRadioPowerCalculator.java

...etests/src/com/android/internal/os/BatteryStatsTests.java

...ts/src/com/android/internal/os/BatteryUsageStatsRule.java

...m/android/internal/os/MobileRadioPowerCalculatorTest.java

...sts/src/com/android/internal/os/MockBatteryStatsImpl.java

...ava/com/android/server/am/BatteryExternalStatsWorker.java

.../core/java/com/android/server/am/BatteryStatsService.java