Merge "Track the battery usage in different dimensions in AppBatteryTracker"