[automerger skipped] Merge "Fix PowerStatsService dumpsys and include...

[automerger skipped] Merge "Fix PowerStatsService dumpsys and include PowerStatsLogger info" into udc-qpr-dev am: c9d30749 am: f7dceb93 -s ours

am skip reason: Merged-In I267e05ae7cc7f9eb4859f81d3180ad5258201d57 with SHA-1 ab044bf2 is already in history

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



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