[automerger skipped] Proportionally attribute Mobile Radio Energy Consumption...

[automerger skipped] Proportionally attribute Mobile Radio Energy Consumption to Phone usage. am: 1481bb02 -s ours am: 052b387a -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: Ice2014945f0e49c0a4aa2ddaa44f7a7d29c424c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>