Merge "Demonstrate per Uid screen energy measurement in BatteryStatsViewer"