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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e929c6f403cce3179e3b7531bf4caf17bdeb967