Merge "Remove SensorManagerTest BrokenTests" into froyo