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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98ab93a72798b07f537bbe680bb98ea82bcf493b