Revert "Remove BatteryStats user activity types and use PowerManager ones instead."

This reverts commit 79e517c3d45ce704ff43f068fbb63d24ab4693c6.

Reason for revert: b/243434675

Change-Id: Ie2476f23715ed933064470ee2f50d550e92d46b8
Merged-In: I5cfdd6a7c21ed322f50d7605fdd470b41726f4cf
(cherry picked from commit e8ab134de1bbc61b1454822df7951c23e2b49775)
Merged-In: Ie2476f23715ed933064470ee2f50d550e92d46b8
6 files changed