Merge "Accumulate Mobile Radio and Gnss measured energy in BatteryStats" into sc-dev