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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf31eb2079cf63608ff344e135430cf132d821a5