[automerger skipped] Merge "Revert "Remove BatteryStats user activity types...

[automerger skipped] Merge "Revert "Remove BatteryStats user activity types and use PowerManager ones instead."" into tm-qpr-dev am: 900e693d am: 1854f26f -s ours

am skip reason: Merged-In I5cfdd6a7c21ed322f50d7605fdd470b41726f4cf with SHA-1 2d970d32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19734803



Change-Id: I48a51df929b343bc3ef32ae3ac60d6b89ab7eb0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>