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

[automerger skipped] Merge "Proportionally attribute Mobile Radio Energy Consumption to Phone usage." into tm-qpr-dev am: 3a32c228 -s ours am: 962c7737 -s ours

am skip reason: Merged-In I5db49ea7c88cfd502db36265ae5a6555f728d2f7 with SHA-1 1481bb02 is already in history

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



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