Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev...

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

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



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