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

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

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