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 am: 9f4f53ec

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

Change-Id: I473fba0782961627da930ce5e1266fb3197eb5f5