[automerger skipped] power/stats: Add EnergyConsumer types am: 74e09c73 am:...

[automerger skipped] power/stats: Add EnergyConsumer types am: 74e09c73 am: 34340ba7 am: 99b0f0ad -s ours am: e78d383d -s ours

am skip reason: Change-Id I252a13b0490326ab9557f4a81ee313e57eb36754 with SHA-1 8ddf2986 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a3f61b8a46ebf31066ef33dc035ff9af1bbe34e