Merge "Fix mismatch between measured energy value for GNSS" into sc-dev am: cfe7c4f1 am: 1619a3e2

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

Change-Id: I60e8922a7063f33fb946a0fb4fbf1f2944eaed9e