Merge "Add discharge power estimates to BatteryUsageStats" into sc-dev am: 9fb89c22 am: 0b4fe941

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13538912

Change-Id: I280177b5d41b23c30820932b033996320219d87f