Merge "power/stats: Add more energy consumer types" am: a5ec53d68f am: 807acbb8c4 am: 1e63ebcda9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb68958515ff595651fd3e3737c00f1c55422342