Merge "Restrict the SensorAdditionalInfoTest only to hardware/non-synthetic sensors"