Merge "BatteryStats CTS: add attention to UserActivity"