Merge "Change power stats ownership" into main am: 940d03bb am: fc453696

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



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