Merge "Add SystemBatteryConsumer.getPowerConsumedByApps()" into sc-dev