Merge "Fix system service power calculation when measured energy is available"...

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

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

Change-Id: I0b0456218c6b53348f5c2951e9c65e5b76e974c1