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