Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev