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

[automerger skipped] Proportionally attribute Mobile Radio Energy Consumption to Phone usage. am: 33d9beaf -s ours am: 37dc070a -s ours am: 086cd0a0 -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: I2a2f07768443c686097a660207d9b4176e84b6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>