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

[automerger skipped] Merge "Remove BatteryStats user activity types and use PowerManager ones instead." into tm-qpr-dev am: 28930b91 am: 80068f17 -s ours

am skip reason: Merged-In I835992a08bd4a07350e36ef671c6273c8fee43a0 with SHA-1 bf794e45 is already in history

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



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