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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ba202b9865876cbbd604db97e64cd507742eaca