Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b

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



Change-Id: I472e4dc6a9b0ae0f8f76e2b620ec59e53aba0b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>