Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2
am: 6acbd70713
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184 Change-Id: Iec4786aa45cfdb52a388a3710123aa950c67b3b7
This commit is contained in: