Merge "Double the battery history size on userdebug/eng"