Remove BatteryStats user activity types and use PowerManager ones instead.

Add millisSinceLastUserActivity and lastUserActivityEvent to PowerGroup log when dozing.
Add timeout to PMS log when dozing.

Bug: 243518837
Test: atest BatteryStatsTests
Test: atest PowerManagerServiceTest
Test: manually observe logs using logcat / adb bugreport
NoNonSdkCheck: USER_ACTIVITY_TYPES is only accessed indirectly by apps through dumpLocked() method.
Change-Id: I835992a08bd4a07350e36ef671c6273c8fee43a0
(cherry picked from commit bf794e45858ea052524719e7222b961da9ce8a77)
Merged-In: I835992a08bd4a07350e36ef671c6273c8fee43a0
6 files changed