[automerger skipped] Merge "Proportionally attribute Mobile Radio Energy...

[automerger skipped] Merge "Proportionally attribute Mobile Radio Energy Consumption to Phone usage." into tm-qpr-dev-plus-aosp am: 392f8faa -s ours am: 2c2239cc -s ours

am skip reason: Merged-In I5db49ea7c88cfd502db36265ae5a6555f728d2f7 with SHA-1 4789053d is already in history

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



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