Merge "Measured energy for Ambient Display in BatteryUsageStats" into sc-dev