Merge commit 'eaeb663bcd7a82b654954b42663232cbd7bef7e7' * commit 'eaeb663bcd7a82b654954b42663232cbd7bef7e7': Track activity foreground CPU usage for battery stats.
Merge commit 'eaeb663bcd7a82b654954b42663232cbd7bef7e7' * commit 'eaeb663bcd7a82b654954b42663232cbd7bef7e7': Track activity foreground CPU usage for battery stats.