Merge "Fix the accounting for background battery usage of abusive apps."