Merge "powerstats: add new EnergyConsumerType for camera" am: 72a3964894

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

Change-Id: Ia20ed50b69597a943ed271095c9d928480d0d091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>