Merge "[IT01] Move power state stats logging out from NMS" am: 6557000a am: b5cf3d63

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac33b23f3e6beb313d1fae0f36d5b99d001cb635