Merge "Proportionally attribute Mobile Radio Energy Consumption to Phone usage." into tm-qpr-dev-plus-aosp