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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie661b6a70d04d2f60b196e219868692228537760