Merge "Skip BatteryStatsManagerTest on Q"