Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b am: 9f4f53ec am: 4033dd37

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

Change-Id: I05f26045e4f9e6cf52881c4b3ba38934fbfa434d