Merge "power/stats: Clean up warnings" am: dfd890a101 am: 9202d2c0a6 am: e7cdfd9a6d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcc226047c6719a5599ea338ed57c1a1a16f0426