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

[automerger skipped] Merge "Fix PowerStatsService dumpsys and include PowerStatsLogger info" into udc-d1-dev am: a0638f14 -s ours am: 6f8e665f -s ours am: 8e672b10 -s ours

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

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



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