[automerger skipped] Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b am: 9d9976b6 am: 93ac9155 -s ours

am skip reason: Merged-In Ibc1a504014ac10c285b71273ba50493ba237f6a9 with SHA-1 acb52c2f is already in history

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



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